Commit Debian 3.0 (quilt) metadata

[dgit (13.12) quilt-fixup]

diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index 72ccb4c4a8258474943a4d8bca7b2dcb46ef81b3..70e2f5ef9e5b8aa0276a5be78b4bb67dd8eb72f4 100644 (file)
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -15,8 +15,8 @@ upload of upstream version 1.2.3, you could use:
 clone`.)
 
 A single combined diff, containing all the changes, follows.
---- git-annex-10.20250416.orig/COPYRIGHT
-+++ git-annex-10.20250416/COPYRIGHT
+--- git-annex-10.20250721.orig/COPYRIGHT
++++ git-annex-10.20250721/COPYRIGHT
 @@ -63,11 +63,14 @@ License: GPL-2
   The full text of version 2 of the GPL is distributed in
   /usr/share/common-licenses/GPL-2 on Debian systems.
@@ -54,16 +54,8 @@ A single combined diff, containing all the changes, follows.
  License: BSD-2-clause
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
---- git-annex-10.20250416.orig/Database/Keys.hs
-+++ git-annex-10.20250416/Database/Keys.hs
-@@ -1,6 +1,6 @@
- {- Sqlite database of information about Keys
-  -
-- - Copyright 2015-2022 Joey Hess <id@joeyh.name>
-+ - Copyright 2015-2025 Joey Hess <id@joeyh.name>
-  -
-  - Licensed under the GNU AGPL version 3 or higher.
-  -}
+--- git-annex-10.20250721.orig/Database/Keys.hs
++++ git-annex-10.20250721/Database/Keys.hs
 @@ -260,7 +260,7 @@ isInodeKnown i s = or <$> runReaderIO Co
   - is an associated file.
   -}
@@ -73,9 +65,9 @@ A single combined diff, containing all the changes, follows.
        ( return mempty
        , do
                gitindex <- inRepo currentIndexFile
-@@ -335,6 +335,14 @@ reconcileStaged dbisnew qh = ifM isBareR
-       getindextree = inRepo $ \r -> writeTreeQuiet $ r
-               { gitGlobalOpts = gitGlobalOpts r ++ bypassSmudgeConfig }
+@@ -344,6 +344,14 @@ reconcileStaged dbisnew qh = ifM isBareR
+                       { gitGlobalOpts = gitGlobalOpts r ++ bypassSmudgeConfig }
+               )
        
 +      notneeded = isBareRepo
 +              -- Avoid doing anything when run by the